merge?

diff --cc tools/python/xen/lowlevel/xs/xs.c
index b7101d1a61cf239a152aeeac12ef34a42c53f985,6ab98cf799206057748ce47aa8821fbdbc8c733d..8944bfa4cc8fd06292bed20683a18f09937ab877
--- 1/tools/python/xen/lowlevel/xs/xs.c
--- 2/tools/python/xen/lowlevel/xs/xs.c
+++ b/tools/python/xen/lowlevel/xs/xs.c
@@@ -15,6 -15,6 +15,7 @@@
   * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
   *
   * Copyright (C) 2005 Mike Wray Hewlett-Packard
++ * Copyright (C) 2005 Christian Limpach <Christian.Limpach@cl.cam.ac.uk>
   *
   */